bitkeeper revision 1.1541 (42939e8dPtCrrAl0Ko8RIXg1LNswnQ)

[PATCH] vmx-fix-vmxbug.patch

Tighten VMX bug checking.

Signed-off-by: Mikhail Kharitonov <mikhail.i.kharitonov@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>

diff --git a/xen/arch/x86/vmx.c b/xen/arch/x86/vmx.c
index 80c778a2deeb2fd771eeab5363499e90ec151c1b..f3a3b541ef80a3b16a9cc9bb5f04c4779b663b7b 100644 (file)
--- a/xen/arch/x86/vmx.c
+++ b/xen/arch/x86/vmx.c
@@ -1099,7 +1099,7 @@ asmlinkage void vmx_vmexit_handler(struct cpu_user_regs regs)
         unsigned long va;
 
         if ((error = __vmread(VM_EXIT_INTR_INFO, &vector))
-            && !(vector & INTR_INFO_VALID_MASK))
+            || !(vector & INTR_INFO_VALID_MASK))
             __vmx_bug(&regs);
         vector &= 0xff;